Use accessor functions to access GtkButton

diff --git a/gtk/gtkcheckbutton.c b/gtk/gtkcheckbutton.c
index 57a591488b2f2bbf7bd2341354649e76a22b0dc0..fa993804c35a6ad99df7b27c2379d4f8abef5947 100644 (file)
--- a/gtk/gtkcheckbutton.c
+++ b/gtk/gtkcheckbutton.c
@@ -273,7 +273,7 @@ gtk_check_button_size_allocate (GtkWidget     *widget,
       gtk_widget_set_allocation (widget, allocation);
 
       if (gtk_widget_get_realized (widget))
-       gdk_window_move_resize (button->event_window,
+       gdk_window_move_resize (gtk_button_get_event_window (button),
                                allocation->x, allocation->y,
                                allocation->width, allocation->height);
 

diff --git a/gtk/gtkmenutoolbutton.c b/gtk/gtkmenutoolbutton.c
index 65bffeb901ebb448b984eae511ba449b28ad33af..940b4f20a0a4ddfdcf6e6b792a4c5944b33e6365 100644 (file)
--- a/gtk/gtkmenutoolbutton.c
+++ b/gtk/gtkmenutoolbutton.c
@@ -310,7 +310,7 @@ menu_position_func (GtkMenu           *menu,
     }
   else 
     {
-      gdk_window_get_origin (GTK_BUTTON (priv->arrow_button)->event_window, x, y);
+      gdk_window_get_origin (gtk_button_get_event_window (GTK_BUTTON (priv->arrow_button)), x, y);
       gtk_widget_get_preferred_size (priv->arrow_button,
                                      &req, NULL);
 

diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c
index 87b180f99982d7ac4d5bfb3ee7a4ed8d2e76a16b..c6f520ccd11687df3d0cc8592c92041c7c4cf868 100644 (file)
--- a/gtk/gtktoolbar.c
+++ b/gtk/gtktoolbar.c
@@ -2603,7 +2603,7 @@ menu_position_func (GtkMenu  *menu,
 
   gtk_widget_get_allocation (priv->arrow_button, &allocation);
 
-  gdk_window_get_origin (GTK_BUTTON (priv->arrow_button)->event_window, x, y);
+  gdk_window_get_origin (gtk_button_get_event_window (GTK_BUTTON (priv->arrow_button)), x, y);
   if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
     {
       if (gtk_widget_get_direction (GTK_WIDGET (toolbar)) == GTK_TEXT_DIR_LTR) 

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index de2bb259631ee55295565de85713094c57c1b9bc..18fdf51a438a22b4d9e031cd514bbb11464de484 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -9295,7 +9295,7 @@ _gtk_tree_view_column_start_drag (GtkTreeView       *tree_view,
 
   send_event = gdk_event_new (GDK_LEAVE_NOTIFY);
   send_event->crossing.send_event = TRUE;
-  send_event->crossing.window = g_object_ref (GTK_BUTTON (column->button)->event_window);
+  send_event->crossing.window = g_object_ref (gtk_button_get_event_window (GTK_BUTTON (column->button)));
   send_event->crossing.subwindow = NULL;
   send_event->crossing.detail = GDK_NOTIFY_ANCESTOR;
   send_event->crossing.time = GDK_CURRENT_TIME;

diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c
index a62165b28178e9499a76a8228e4c38a65fe6422d..161eb6d315532b54f451007ffb2751c77160d33f 100644 (file)
--- a/gtk/gtktreeviewcolumn.c
+++ b/gtk/gtktreeviewcolumn.c
@@ -1098,7 +1098,7 @@ gtk_tree_view_column_button_event (GtkWidget *widget,
       ((GdkEventButton *)event)->button == 1)
     {
       column->maybe_reordered = TRUE;
-      gdk_window_get_pointer (GTK_BUTTON (widget)->event_window,
+      gdk_window_get_pointer (gtk_button_get_event_window (GTK_BUTTON (widget)),
                              &column->drag_x,
                              &column->drag_y,
                              NULL);